merge with xen-unstable.hg

diff --cc .hgignore
Simple merge

diff --cc tools/libxc/xc_domain.c
Simple merge

diff --cc tools/libxc/xenctrl.h
Simple merge

diff --cc tools/python/xen/xend/XendDomainInfo.py
Simple merge

diff --cc xen/arch/ia64/Rules.mk
Simple merge